Fix vi-mode search feature to work similar to Vim #996
Conversation
…query is matched.
src/ext/isearch.lisp
Outdated
| (unless (funcall *isearch-search-function* (current-point) *isearch-string*) | ||
| (move-point (current-point) *isearch-start-point*)) |
There was a problem hiding this comment.
I changed here because I think the current behavior is not intended that the cursor point doesn't go back when the search fails.
There was a problem hiding this comment.
Ah, I see.
if you write the following, the current-point might not be broken when interrupted.
(with-point ((point (current-point)))
(when (funcall *isearch-search-function* point *isearch-string*)
(move-point (current-point) point)))There was a problem hiding this comment.
Oh, that looks better. I'll rewrite it as you suggested. Thanks!
There was a problem hiding this comment.
Sorry, this has to be the code I originally changed.
For example, when I have a buffer like the following:
[a]pple orange grape
When starting ISearch with C-s lisp, then the cursor moves to app[l]e even though the search is failed.
It's better to go back to the starting point when the search has failed. How do you think?
| (prog1 | ||
| (cond ((variable-value 'isearch-next-last :buffer) | ||
| (setf (variable-value 'isearch-next-last :buffer) nil) | ||
| (with-point ((p (current-point))) | ||
| (buffer-start p) | ||
| (if (funcall *isearch-search-forward-function* p *isearch-string*) | ||
| (progn | ||
| (move-point (current-point) p) | ||
| t) | ||
| nil))) | ||
| ((not (funcall *isearch-search-forward-function* (current-point) *isearch-string*)) | ||
| (setf (variable-value 'isearch-next-last :buffer) t) | ||
| nil) | ||
| (t)) | ||
| (isearch-update-display)))) |
There was a problem hiding this comment.
Changed to return a boolean value to tell whether the search is successful.
| ((not (funcall *isearch-search-backward-function* (current-point) *isearch-string*)) | ||
| (setf (variable-value 'isearch-prev-last :buffer) t) | ||
| nil) | ||
| (t)) |
There was a problem hiding this comment.
This returns T. Is this intended?
There was a problem hiding this comment.
Yep. I changed this to return a boolean value as I did to isearch-next.
|
It looks very good, Thanks! |
/), moving to the next match (n)nandNwhen searching backward (?)nshould search backward if the last search was backwardfixes #314